Merge changes from topic "bootclasspath_default_libs"
am: e58881ac38

Change-Id: I4af17bc7c0668478cc9027029a05711fa2e2c945