Merge "Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES" am: 616b8a5370
am: 914a568ba0

* commit '914a568ba0b31fd0502b86b1d45abdf0f6ee49f1':
  Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES