Merge "Remove libandroid.so from media namespace."
am: aa952fa545

Change-Id: I32af3044529b1bb07022538d77e82bd2cd66be14