[automerger skipped] Merge "Move frameworks/base off the SRC_API_DIR variable." am: 2a4277fb00 am: 5629dc7849  -s ours
am: b583679038  -s ours

Change-Id: Ib75e866a659e2835ea3e317b02e64e3af9f7e695