Merge "Prepare for libnative{bridge,loader} moving to art/"
am: 2a46301b48

Change-Id: Iafc1d91efdc1fa12ac6b4ffb16cba1cfc346e6fa