Merge "Remove framework from LOCAL_JAVA_LIBRARIES"
am: e252149ab9

* commit 'e252149ab99a008a0a75734326755cadd5c5ee7a':
  Remove framework from LOCAL_JAVA_LIBRARIES