Merge "Move frameworks/base off the SRC_API_DIR variable."
am: 2a4277fb00

Change-Id: I7912e0aec15b478cff139c8312893d418c360ef2