[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 587a2cb1  -s ours am: d045c294  -s ours
am: d909dafe  -s ours

Change-Id: I9fbc0bb19f32adb953fbc63255a5efe5b45fa5bc

[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 587a2cb1  -s ours
am: d045c294  -s ours

Change-Id: Ib7307db888d81b076f8aff4ce0bf17f072b01de6

am: 587a2cb1  -s ours

Change-Id: I75dc7f9b9e428ae5a5ceee0c58f0e8e538fb6c67

Change-Id: I587641373427312009d019ee80b1acd346e8d70b

[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 1b5c0207  -s ours
am: d7c8b95a  -s ours

Change-Id: I2c9781de9232c789b79b79a3737b7e442fd670e8

am: 1b5c0207  -s ours

Change-Id: I6a7715041e6c113d464fd2f9abebbd5ed3cea527

Change-Id: I4eed68a0a5f001a58f952b21aefeae58416a3694

am: 3a6b77ce

Change-Id: I5d5612bcc4c96940a687f773ee0e0874d80a8e13

am: 606eb68b

Change-Id: Ie5eea3e4d1db884d4fb7eb98ff8167e6468bf730

am: 396213a3

Change-Id: I2a1771808c4d76e6532b67be64edd02b44ae89fc

am: daf18929

Change-Id: I9e1f4563aa7337fe6354f50c1fbdb90c581ab14e

Bug: 112104996
Change-Id: Iae25cff54338fd7b2d09ab437ae6c89c55f7e775

am: 5f97ab5b

Change-Id: If1a7ad90708bb0b3e8485dfd3be849cd3c997e75

am: 5a34f66d

Change-Id: I1f9a486d143c466fdba9eefe51276f311e974ee9

am: 2d88f8dc

Change-Id: Ibcc3dd257230eaf18e29ccc55f2165b97b7136fc

Test: NA
Change-Id: I41ca21e07fd04696eb9eac3dd9d569fd8f566b5e

am: 1baf3e56

Change-Id: Ie1e0cb6e984f6e1b6ff58b250fcf558547c936a4

am: f2fa6aca

Change-Id: I609f2a0e9c7d320bb196a7da25216fefecfd65eb

Bug: 79597307
Change-Id: If1e4a965391c10a6b0daf1519c4abb36de703753

Change-Id: I37daa5f4452442119a1582626c183326281ed0ea

am: 00994822

Change-Id: I05b051eb5f84e13c396bf8be17963b3a95a8329b

am: 9c50b5e1

Change-Id: I26bf81737722d1efe6f68889c6f26d328bdb0aef

On 32-bit devices we trigger SIGBUS by trying to copy around the
std::string, so parse it immediately to avoid trouble.

Test: manual with 32-bit binary
Bug: 73961200
Change-Id: I32028fd18a00f3a40d380145cb7a7874b758f5c4

Change-Id: I4ea5ace33d4be3a7d1c383353b7054d9ad71d6be

am: 440257ca

Change-Id: I63935dfbb126c4b1da36d7ab40d311e7481104ff

am: b0730c97

Change-Id: I8a8e6c958e5cd125902e114eba74fb405766f1b8

am: 09d40325

Change-Id: I908abb4e84b0b74f50c257daf1086dded5584d74

Clang 6.0.1 update introduced a number of new warnings, failing
werror build. Ignore the -Wpragma-pack warning for external/gptfdisk.

Test: m checkbuild
Change-Id: Ib9033cd5039d47d171b03c7472663593f01d9f4b

Change-Id: Iff6173c46bf37e163e23ecc31d5d8985cd7473c7

Before this patch, requesting a code like "0x0c00" would be flattened
to "0x0700" because it was translated through the GUID type table.

Callers creating MBR tables expect these codes to flow through without
this fidelity loss.  To support this, we stash away any provided hex
type and return it instead of doing a lookup.

Test: cts-tradefed run commandAndExit cts-dev --abi armeabi-v7a -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AdoptableHostTest
Bug: 63735902
Change-Id: If61407960c9ad1050e5f9031617d71d68f7820b4

release-request-d4f45cf4-9d73-4828-baa4-f73aa4280cd0-for-git_pi-release-4241208 snap-temp-L10800000088711883

Change-Id: I79488f7e32e25afa14b4ba9b4740446fff692dc1

am: 8e3d2305

Change-Id: I10c6fb4e7f1b760a1940feef95d536b6ee70cdba

am: a76de3a0

Change-Id: If6637c8abec4fd0a3934be3ce2407842cb0424a1

gptfdisk: fix stack overflow in parsing cmdline am: 69e46b9a am: 8c834de1 am: ff3551bb am: 0c7af6fa
am: f95cce37

Change-Id: I7099c34cba7b4fbf51e256a4b46aed11c4df9209

am: 0c7af6fa

Change-Id: Icc2d6f7558a1b1279f42eaec2628581b431f0fa0

am: ff3551bb

Change-Id: I6678487f46848c2de3d77bf7a75ec67634c82921

am: 8c834de1

Change-Id: I200c8e057631eed5ec5eaa70004800eafc0a7914

am: 69e46b9a

Change-Id: I40d12e7b746a75446779991263b3452bd5d06fe5

The getopt_long will return -1 when all command-line
options have been parsed, and the index value will not
be changed in that case.

The caller should check both and handle it properly.

BUG: 64235252

Change-Id: I203dd5bc42bb7ce83e558f25074c7e1a92f250e9

(cherry picked from commit 69e46b9a)

The getopt_long will return -1 when all command-line
options have been parsed, and the index value will not
be changed in that case.

The caller should check both and handle it properly.

Change-Id: I203dd5bc42bb7ce83e558f25074c7e1a92f250e9