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

Change-Id: I3493755e1f0be5372146e73715172abe33c6d1dc