[automerger skipped] Merge "Cut dependency to libandroid.so" am: dd27a6a112
am: 7710516c6c
am:gugelfreidb652328c1
-s ours am skip reason: change_id I5da320780dba7c63ce39679dbf5d40fe9202eb00 with SHA1c34e45328b
is in history Change-Id: I19b37b38b60e0fddb44efcbfe06dfd81fd10b3d7
commit
13c8870eb5