Merge "remove framework_base_subdirs"
am: 46397049fe

Change-Id: I910bc8f5f7266e70fe3d8549aab51c2e504298a0