Merge "Remove framework from LOCAL_JAVA_LIBRARIES" am: e252149ab9
am: ec9081a004

* commit 'ec9081a004db058bb5ada5173d65a565e2005c6d':
  Remove framework from LOCAL_JAVA_LIBRARIES