Merge "Cut dependency to libandroid.so" am: dd27a6a112
am: 7710516c6c

Change-Id: Ieb66cbb03acadc18461855b592a087d441aa44c9