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

Change-Id: I359900f8d9da851616a29d7efefd0647562ba0a8