Merge "remove framework_base_subdirs" am: 46397049fe
am: 7cd8f399f7

Change-Id: I1dc1009490d3e1d26257b7490f1a44bd91b91085