Merge "Remove reference to external/safe-iop from Android.bp."
am: dfe278c757

Change-Id: I7db8726a7cf0ebcf535928f8476a29f645e9d83e