Merge "Move frameworks/base off the SRC_API_DIR variable." into pi-dev-plus-aosp