Merge changes Ie097ea65,I4e32f172

* changes:
  Update hwcomposer to retry when fetching the device config
  Update rild to handle init failure
tree: 4d86e7d4b0cdd24e9cba3211cdbfce37f1aad396
  1. common/
  2. guest/
  3. host/
  4. tests/
  5. tools/
  6. Android.bp
  7. Android.mk
  8. OWNERS
  9. TEST_MAPPING