Merge "Android.mk: Change the source directory to point to new location." am:...
Merge "Android.mk: Change the source directory to point to new location." am: 1394dfdb am: 3cb55a21 am: e54a9844
am: df6a6713
Change-Id: I86dafbf3932a759bbaeeb88e70bbd62d846d0e00