Merge "Convert Android.mk file to Android.bp"
am: 069ba8677d

Change-Id: If2d4cd88fa5103fa8da663f5a1159367474e8ec0