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

Change-Id: Ie28cc127204e11f965e6e1898c856795169c005f