Merge "safe_union@1.0 to vndk-sp"
am: b304fd0509

Change-Id: Icf3c4af93bc12292f1ef382afc956fe75e3f9ab1