Android O MR1 IOT Release 1.0.4 (4973263)
Merge "Fix errors caught by aapt2" am: ce4abe56b9
am: fa0b0f36ae

Change-Id: I9252e54dc3408b0a044f27bee6d6bce55caa8ab4