[automerger skipped] Merge "remove framework_base_subdirs" am: 46397049fe am: 7cd8f399f7
am: de26442649 -s ours
am skip reason: change_id Idfa2aa392ae1da9582e7691a8c06c986baad5088 with SHA1 e53786e864 is in history

Change-Id: Ida2dbab0975cd9af137b4472e03a7287e0fdcff5