Merge "Enable the APEX support on the device side."
am: 239245fe79

Change-Id: I0f4a246c205f4dd382cc7135c166b63c3651f53a