Merge changes from topic 'fsconfig2-fixups'

am: abf3dbe248

Change-Id: I0149e85d05c3fb60f8ab0e878a3a8172a1edaede
This commit is contained in:
Elliott Hughes 2017-01-05 00:31:18 +00:00 committed by android-build-merger
commit 2fe7f7a402

Diff content is not available