Merge "Convert Android.mk file to Android.bp" am: 5656a003e6
am: abff539b0d

Change-Id: I857b2bf3206c0f4a9b06bb07289eb5796321364f