[automerger skipped] Merge "Remove libandroid.so from media namespace." am: aa952fa545
am: 784935b9c2 -s ours
am skip reason: change_id Ia6366834613d1e12498fa90377e79f62a2149776 with SHA1 a8e4b89768 is in history

Change-Id: I67fc6a91f63086417c79b13c5403761bf6cf86e5