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