am d825997d: am 1029013a: Merge "Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex"

* commit 'd825997d8765efd074279ec10ee11eda1f1bb196':
  Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex