Merge "Convert Android.mk file to Android.bp" am: 8dddb7086d am: 8414dcc9ab
am: cc7dc6d20b

Change-Id: I68351cb8df69da083bfa29cdd8a43afd6ba1f219