Merge "Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES" am: 616b8a5370 am: 914a568ba0
am: 036e542c43  -s ours

* commit '036e542c439577a636b344467f82a193f2e2cc32':
  Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES