Merge remote-tracking branch 'aosp/upstream' into master

* 8c5b1d1f Merge pull request #134 from colincross/glob
* 08e4954a Fix optional_subdirs globbing

Test: build, add dalvik/Android.bpk, rebuild, remove dalvik/Android.bp, rebuild
Change-Id: I2f19e1c23757bcb4e19ccf6e7350bea45c74fe42