[automerger skipped] Merge "Update AHardwareBuffer and ANativeWindow documentation." am: 842c416010 am: a01fa3b2f7
am: 32739878dd  -s ours

Change-Id: I2ebf8682700e54e342c3a2c160c13a15756b822b