Merge "Add AID_EXT_DATA_RW / AID_EXT_OBB_RW GIDs." am: e6acbfe556 am: e9b7b464bd

Change-Id: I38f83eae5bf044621626ac2ddb0086e31153b233