Merge "framework is not available to APEXes"
am: f65e0e3181

Change-Id: I01c5137ca2cda4ecb8ca31d11da31dc20d1af624