Merge "Remove hiddenapi-mappings and hiddenapi-list-docs." am: d5ed17de am: fcd3de32 am: 893fc27f Change-Id: Id9d201e02abefdd2b1978acc3a2223171e6eefba