Android 4.0.3 release 1.1
am e20724c9: resolved conflicts for merge of 3154443d to gingerbread-plus-aosp

* commit 'e20724c9c530e03bdeaf3f6ff31f2334ea7ffc72':
  Change systembuilder tag to optional