Change-Id: Ic095cf2aeec77b914dff6966c0cff66124f7a146
Merge and rename shared Android target paths. Change-Id: If2f47bbff5445f4de9e6b3ddb5279920fb6c9ee0