Merge "Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex"