Merge "Move frameworks/base off the SRC_API_DIR variable."